Proper merge for gitignore

[rbdr/super-polarity] / Super Polarity.xcodeproj / project.pbxproj

diff --git a/Super Polarity.xcodeproj/project.pbxproj b/Super Polarity.xcodeproj/project.pbxproj
index 5b989b0c11b376d57121e40623e4691bd08bbc1f..b39b0e24511d528aa5858ff4ddf9f1a1ab45d7b1 100644 (file)
--- a/Super Polarity.xcodeproj/project.pbxproj
+++ b/Super Polarity.xcodeproj/project.pbxproj
@@ -13,17 +13,22 @@
                8E9D792817BA690700C76DC9 /* SDL2_net.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E9D792317BA690700C76DC9 /* SDL2_net.framework */; };
                8E9D792917BA690700C76DC9 /* SDL2_ttf.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E9D792417BA690700C76DC9 /* SDL2_ttf.framework */; };
                8E9D792A17BA690700C76DC9 /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E9D792517BA690700C76DC9 /* SDL2.framework */; };
+               8EC3B7BA17BB185D00D3BDD0 /* ben.png in Copy Static Images */ = {isa = PBXBuildFile; fileRef = 8EC3B7B917BB185700D3BDD0 /* ben.png */; };
+               8EE9CAD717BBB26E00CA3A98 /* actor.c in Sources */ = {isa = PBXBuildFile; fileRef = 8EE9CAD617BBB26E00CA3A98 /* actor.c */; };
+               8EE9CADA17BBB6BF00CA3A98 /* actor_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 8EE9CAD917BBB6BF00CA3A98 /* actor_manager.c */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
-               8E9D78E717BA63F400C76DC9 /* CopyFiles */ = {
+               8E9D78E717BA63F400C76DC9 /* Copy Static Images */ = {
                        isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = /usr/share/man/man1/;
-                       dstSubfolderSpec = 0;
+                       buildActionMask = 12;
+                       dstPath = data/img/static;
+                       dstSubfolderSpec = 16;
                        files = (
+                               8EC3B7BA17BB185D00D3BDD0 /* ben.png in Copy Static Images */,
                        );
-                       runOnlyForDeploymentPostprocessing = 1;
+                       name = "Copy Static Images";
+                       runOnlyForDeploymentPostprocessing = 0;
                };
 /* End PBXCopyFilesBuildPhase section */
 
@@ -36,6 +41,11 @@
                8E9D792317BA690700C76DC9 /* SDL2_net.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2_net.framework; path = vendor/frameworks/SDL2_net.framework; sourceTree = "<group>"; };
                8E9D792417BA690700C76DC9 /* SDL2_ttf.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2_ttf.framework; path = vendor/frameworks/SDL2_ttf.framework; sourceTree = "<group>"; };
                8E9D792517BA690700C76DC9 /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = vendor/frameworks/SDL2.framework; sourceTree = "<group>"; };
+               8EC3B7B917BB185700D3BDD0 /* ben.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ben.png; path = data/img/static/ben.png; sourceTree = "<group>"; };
+               8EE9CAD517BBAD9000CA3A98 /* actor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = actor.h; sourceTree = "<group>"; };
+               8EE9CAD617BBB26E00CA3A98 /* actor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = actor.c; sourceTree = "<group>"; };
+               8EE9CAD817BBB6B000CA3A98 /* actor_manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = actor_manager.h; sourceTree = "<group>"; };
+               8EE9CAD917BBB6BF00CA3A98 /* actor_manager.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = actor_manager.c; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -57,6 +67,7 @@
                8E9D78E017BA63F400C76DC9 = {
                        isa = PBXGroup;
                        children = (
+                               8EC3B7B617BB183500D3BDD0 /* data */,
                                8E9D792117BA690700C76DC9 /* SDL2_image.framework */,
                                8E9D792217BA690700C76DC9 /* SDL2_mixer.framework */,
                                8E9D792317BA690700C76DC9 /* SDL2_net.framework */,
@@ -78,12 +89,48 @@
                8E9D78F517BA646F00C76DC9 /* src */ = {
                        isa = PBXGroup;
                        children = (
+                               8EE9CAD417BBAD6D00CA3A98 /* lib */,
                                8E9D78F617BA646F00C76DC9 /* main.c */,
                                8E9D78F717BA646F00C76DC9 /* Super_Polarity.1 */,
                        );
                        path = src;
                        sourceTree = "<group>";
                };
+               8EC3B7B617BB183500D3BDD0 /* data */ = {
+                       isa = PBXGroup;
+                       children = (
+                               8EC3B7B717BB183900D3BDD0 /* img */,
+                       );
+                       name = data;
+                       sourceTree = "<group>";
+               };
+               8EC3B7B717BB183900D3BDD0 /* img */ = {
+                       isa = PBXGroup;
+                       children = (
+                               8EC3B7B817BB183E00D3BDD0 /* static */,
+                       );
+                       name = img;
+                       sourceTree = "<group>";
+               };
+               8EC3B7B817BB183E00D3BDD0 /* static */ = {
+                       isa = PBXGroup;
+                       children = (
+                               8EC3B7B917BB185700D3BDD0 /* ben.png */,
+                       );
+                       name = static;
+                       sourceTree = "<group>";
+               };
+               8EE9CAD417BBAD6D00CA3A98 /* lib */ = {
+                       isa = PBXGroup;
+                       children = (
+                               8EE9CAD517BBAD9000CA3A98 /* actor.h */,
+                               8EE9CAD617BBB26E00CA3A98 /* actor.c */,
+                               8EE9CAD817BBB6B000CA3A98 /* actor_manager.h */,
+                               8EE9CAD917BBB6BF00CA3A98 /* actor_manager.c */,
+                       );
+                       name = lib;
+                       sourceTree = "<group>";
+               };
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -93,7 +140,7 @@
                        buildPhases = (
                                8E9D78E517BA63F400C76DC9 /* Sources */,
                                8E9D78E617BA63F400C76DC9 /* Frameworks */,
-                               8E9D78E717BA63F400C76DC9 /* CopyFiles */,
+                               8E9D78E717BA63F400C76DC9 /* Copy Static Images */,
                        );
                        buildRules = (
                        );
@@ -136,6 +183,8 @@
                        buildActionMask = 2147483647;
                        files = (
                                8E9D78F817BA646F00C76DC9 /* main.c in Sources */,
+                               8EE9CAD717BBB26E00CA3A98 /* actor.c in Sources */,
+                               8EE9CADA17BBB6BF00CA3A98 /* actor_manager.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -204,10 +253,12 @@
                8E9D78F317BA63F400C76DC9 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               CLANG_ENABLE_OBJC_ARC = NO;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "\"$(SRCROOT)/vendor/frameworks\"",
                                );
+                               MACH_O_TYPE = mh_execute;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Debug;
@@ -215,10 +266,12 @@
                8E9D78F417BA63F400C76DC9 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               CLANG_ENABLE_OBJC_ARC = NO;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "\"$(SRCROOT)/vendor/frameworks\"",
                                );
+                               MACH_O_TYPE = mh_execute;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;